page/sale_views.py

@@ -9,7 +9,7 @@ from django_logit import logit

                 from django_response import response
              

                 from paginator import pagination
              

                 
              

                -from account.models import SaleclerkInfo, UserInfo
              

                +from account.models import FranchiserInfo, SaleclerkInfo, UserInfo
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              

                 from mch.models import ModelInfo
              

                 from product.models import ProductCodeSubmitLogInfo, ProductInfo, ProductModelInfo
              
@@ -73,11 +73,22 @@ def clerk_sale_submit_api(request):

                         test_user=clerk.test_user,
              

                     )
              

                 
              

                -    if SaleclerkIntegralIncomeExpensesInfo.objects.filter(code=serialNo, status=True).exists():
              

                -        return response(SaleclerkStatusCode.DUPLICATE_SUBMIT)
              

                +    try:
              

                +        sci = SaleclerkIntegralIncomeExpensesInfo.objects.get(code=serialNo, status=True)
              

                +    except SaleclerkIntegralIncomeExpensesInfo.DoesNotExist:
              

                +        sci = None
              

                +
              

                +    if sci:
              

                +        try:
              

                +            clerk = SaleclerkInfo.objects.get(clerk_id=sci.clerk_id, status=True)
              

                +        except SaleclerkInfo.DoesNotExist:
              

                +            clerk = None
              

                +        return response(SaleclerkStatusCode.DUPLICATE_SUBMIT, data={
              

                +            'franchiser_name': clerk.franchiser_name,
              

                +            'clerk_name': clerk.clerk_name,
              

                +        } if clerk else {})
              

                 
              

                     # 店员积分
              

                -    # TODO： 序列号 vs. 积分
              

                     try:
              

                         model = ModelInfo.objects.get(ModelID=ModelID)
              

                     except ModelInfo.DoesNotExist: